From 6fe9162fdfd5c0ec8cdf169a3c7bed22cdaf1f0a Mon Sep 17 00:00:00 2001 From: Jason Rumney Date: Thu, 12 Feb 2009 14:36:33 +0000 Subject: [PATCH] (x_display_pixel_height, x_display_pixel_width): Release DC when finished. Use NULL window to refer to desktop. (w32_term_init): Use NULL window to refer to desktop. (Bug#460) --- src/w32term.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/w32term.c b/src/w32term.c index 7ad7778feaa..34fc450217f 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -464,14 +464,20 @@ int x_display_pixel_height (dpyinfo) struct w32_display_info *dpyinfo; { - return GetDeviceCaps (GetDC (GetDesktopWindow ()), VERTRES); + HDC dc = GetDC (NULL); + int pixels = GetDeviceCaps (dc, VERTRES); + ReleaseDC (NULL, dc); + return pixels; } int x_display_pixel_width (dpyinfo) struct w32_display_info *dpyinfo; { - return GetDeviceCaps (GetDC (GetDesktopWindow ()), HORZRES); + HDC dc = GetDC (NULL); + int pixels = GetDeviceCaps (dc, HORZRES); + ReleaseDC (NULL, dc); + return pixels; } @@ -6216,7 +6222,7 @@ w32_term_init (display_name, xrm_option, resource_name) dpyinfo->next = x_display_list; x_display_list = dpyinfo; - hdc = GetDC (GetDesktopWindow ()); + hdc = GetDC (NULL); dpyinfo->root_window = GetDesktopWindow (); dpyinfo->n_planes = GetDeviceCaps (hdc, PLANES); @@ -6224,7 +6230,7 @@ w32_term_init (display_name, xrm_option, resource_name) dpyinfo->resx = GetDeviceCaps (hdc, LOGPIXELSX); dpyinfo->resy = GetDeviceCaps (hdc, LOGPIXELSY); dpyinfo->has_palette = GetDeviceCaps (hdc, RASTERCAPS) & RC_PALETTE; - ReleaseDC (GetDesktopWindow (), hdc); + ReleaseDC (NULL, hdc); /* initialise palette with white and black */ { -- 2.30.2